Fixes

svn path=/trunk/; revision=20197

diff --git a/ChangeLog b/ChangeLog
index 55032e0fa1e6e94331686c45addf031aa28b615f..f0de74b18a6b71b0a809005f28705c62f3042334 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 2008-05-27  Matthias Clasen  <mclasen@redhat.com>
 
-       106574 - Inconsistent increment behavior for gtkspinbutton
+       Bug 351910 – Search column setting lost
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_column): Clarify
+       the docs. Patch by Matt Barnes.
+
+2008-05-27  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 477278 - avoid unnecessary pointer subtraction
+
+       * gtk/gtkaccelgroup.c (quick_accel_remove): Avoid pointer 
+       subtraction that sparse complains about. Patch by Christian
+       Persch.
+
+2008-05-27  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 106574 - Inconsistent increment behavior for gtkspinbutton
 
        * gtk/gtkspinbutton.c (gtk_spin_button_real_value_change):
        Commit the entry text before doing an increment. Patch by

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 4a121fcfba85eb3786afaee1c5ec60b52a420634..cc7df18d02fd2dc2748d7f4fbf5def0ca1987303 100644 (file)
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -397,10 +397,10 @@ quick_accel_add (GtkAccelGroup  *accel_group,
 
 static void
 quick_accel_remove (GtkAccelGroup      *accel_group,
-                   GtkAccelGroupEntry *entry)
+                    guint               pos)
 {
-  guint pos = entry - accel_group->priv_accels;
   GQuark accel_quark = 0;
+  GtkAccelGroupEntry *entry = accel_group->priv_accels + pos;
   guint accel_key = entry->key.accel_key;
   GdkModifierType accel_mods = entry->key.accel_mods;
   GClosure *closure = entry->closure;
@@ -577,7 +577,7 @@ gtk_accel_group_disconnect (GtkAccelGroup *accel_group,
     if (accel_group->priv_accels[i].closure == closure)
       {
        g_object_ref (accel_group);
-       quick_accel_remove (accel_group, accel_group->priv_accels + i);
+       quick_accel_remove (accel_group, i);
        g_object_unref (accel_group);
        return TRUE;
       }

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 9e676f0e363ab2d40770b5cf3b81c2fbc0fc50d8..ea25e57affba64dad0ee533832e349e4d6147793 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -13889,13 +13889,14 @@ gtk_tree_view_get_search_column (GtkTreeView *tree_view)
  * @column: the column of the model to search in, or -1 to disable searching
  *
  * Sets @column as the column where the interactive search code should
- * search in. 
+ * search in for the current model. 
  * 
  * If the search column is set, users can use the "start-interactive-search"
  * key binding to bring up search popup. The enable-search property controls
  * whether simply typing text will also start an interactive search.
  *
- * Note that @column refers to a column of the model. 
+ * Note that @column refers to a column of the current model. The search 
+ * column is reset to -1 when the model is changed.
  */
 void
 gtk_tree_view_set_search_column (GtkTreeView *tree_view,